remove artifact from the time when type checking casts warned on NULL,

2007-04-02  Michael Natterer  <mitch@imendio.com>

	* gtk/gtkmenushell.c (gtk_real_menu_shell_move_current): remove
	artifact from the time when type checking casts warned on NULL,
	some whitespace cleanup.

svn path=/trunk/; revision=17578

diff --git a/ChangeLog b/ChangeLog
index 2508844a83aaa3fc655c1be98863ed3290591521..be92a8285222c970cbe92128c2ed9a894a2e6c36 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-04-02  Michael Natterer  <mitch@imendio.com>
+
+       * gtk/gtkmenushell.c (gtk_real_menu_shell_move_current): remove
+       artifact from the time when type checking casts warned on NULL,
+       some whitespace cleanup.
+
 2007-04-01  Cody Russell  <bratsche@gnome.org>
 
        * modules/engines/ms-windows/msw_style.c: Fix rendering of

diff --git a/gtk/gtkmenushell.c b/gtk/gtkmenushell.c
index 74596ec96cf6a8816a656493524f608ab6b2d4f8..9862b5b64f5fac7292d03c0ef336ab154ee898b3 100644 (file)
--- a/gtk/gtkmenushell.c
+++ b/gtk/gtkmenushell.c
@@ -1195,16 +1195,16 @@ gtk_real_menu_shell_move_current (GtkMenuShell      *menu_shell,
     case GTK_MENU_DIR_PARENT:
       if (parent_menu_shell)
        {
-         if (GTK_MENU_SHELL_GET_CLASS (parent_menu_shell)->submenu_placement == 
-                      GTK_MENU_SHELL_GET_CLASS (menu_shell)->submenu_placement)
+         if (GTK_MENU_SHELL_GET_CLASS (parent_menu_shell)->submenu_placement ==
+              GTK_MENU_SHELL_GET_CLASS (menu_shell)->submenu_placement)
            gtk_menu_shell_deselect (menu_shell);
-         else 
+         else
            {
              if (PACK_DIRECTION (parent_menu_shell) == GTK_PACK_DIRECTION_LTR)
                gtk_menu_shell_move_selected (parent_menu_shell, -1);
              else
                gtk_menu_shell_move_selected (parent_menu_shell, 1);
-             gtk_menu_shell_select_submenu_first (parent_menu_shell); 
+             gtk_menu_shell_select_submenu_first (parent_menu_shell);
            }
        }
       /* If there is no parent and the submenu is in the opposite direction
@@ -1222,7 +1222,7 @@ gtk_real_menu_shell_move_current (GtkMenuShell      *menu_shell,
            _gtk_menu_shell_select_last (submenu, TRUE);
        }
       break;
-      
+
     case GTK_MENU_DIR_CHILD:
       if (menu_shell->active_menu_item &&
          _gtk_menu_item_is_selectable (menu_shell->active_menu_item) &&
@@ -1233,18 +1233,13 @@ gtk_real_menu_shell_move_current (GtkMenuShell      *menu_shell,
        }
 
       /* Try to find a menu running the opposite direction */
-      while (parent_menu_shell && 
+      while (parent_menu_shell &&
             (GTK_MENU_SHELL_GET_CLASS (parent_menu_shell)->submenu_placement ==
              GTK_MENU_SHELL_GET_CLASS (menu_shell)->submenu_placement))
        {
-         GtkWidget *tmp_widget = parent_menu_shell->parent_menu_shell;
-         
-         if (tmp_widget)
-           parent_menu_shell = GTK_MENU_SHELL (tmp_widget);
-         else
-           parent_menu_shell = NULL;
+         parent_menu_shell = GTK_MENU_SHELL (parent_menu_shell->parent_menu_shell);
        }
-      
+
       if (parent_menu_shell)
        {
          if (PACK_DIRECTION (parent_menu_shell) == GTK_PACK_DIRECTION_LTR)
@@ -1255,7 +1250,7 @@ gtk_real_menu_shell_move_current (GtkMenuShell      *menu_shell,
          gtk_menu_shell_select_submenu_first (parent_menu_shell);
        }
       break;
-      
+
     case GTK_MENU_DIR_PREV:
       gtk_menu_shell_move_selected (menu_shell, -1);
       if (!had_selection &&
@@ -1263,6 +1258,7 @@ gtk_real_menu_shell_move_current (GtkMenuShell      *menu_shell,
          menu_shell->children)
        _gtk_menu_shell_select_last (menu_shell, TRUE);
       break;
+
     case GTK_MENU_DIR_NEXT:
       gtk_menu_shell_move_selected (menu_shell, 1);
       if (!had_selection &&